Revert "Revert "Revert "window: fix initial shadow width for maximized/fullscreen...

This reverts commit 968ac90e89f444e180d883a28bfd260b118f451d.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 00133126085f3f29a2d21ee442e9a92795be3e10..d98f69d293e383d554a0aa96a2c34f9eb44a1467 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6099,8 +6099,6 @@ gtk_window_map (GtkWidget *widget)
   else
     gdk_window_unmaximize (gdk_window);
 
-  priv->maximize_initially = FALSE;
-
   if (priv->stick_initially)
     gdk_window_stick (gdk_window);
   else
@@ -6122,8 +6120,6 @@ gtk_window_map (GtkWidget *widget)
   else
     gdk_window_unfullscreen (gdk_window);
 
-  priv->fullscreen_initially = FALSE;
-
   gdk_window_set_keep_above (gdk_window, priv->above_initially);
 
   gdk_window_set_keep_below (gdk_window, priv->below_initially);
@@ -6596,9 +6592,7 @@ get_shadow_width (GtkWidget *widget,
     return;
 
   if (priv->maximized ||
-      priv->maximize_initially ||
-      priv->fullscreen ||
-      priv->fullscreen_initially)
+      priv->fullscreen)
     return;
 
   if (!gtk_widget_is_toplevel (widget))